*.js: Make emacs modelines consistent

js2-mode is no longer developed and we recommend js-mode these days,
so switch the modelines to specify that, and make them consistent
across all files.

https://bugzilla.gnome.org/show_bug.cgi?id=660358

diff --git a/js/gdm/batch.js b/js/gdm/batch.js
index cd310d80d4a2ce1603acd67210d8b5e6f5425b5a..bc9642e593bfdd5b2edf30a4d85f7367cfb925e7 100644 (file)
--- a/js/gdm/batch.js
+++ b/js/gdm/batch.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/js/gdm/consoleKit.js b/js/gdm/consoleKit.js
index d5eeb898652c5fbca6f107780d4912d12e6a66a4..99465cb76efbdee93ce45f096aaf639993a83f8c 100644 (file)
--- a/js/gdm/consoleKit.js
+++ b/js/gdm/consoleKit.js
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 

diff --git a/js/gdm/fingerprint.js b/js/gdm/fingerprint.js
index ee08a3af1cc1868d6a9bcdae6a3c6e11ef2356d3..9892ef8ebe490ccc83c63faf3660935871eb8dbe 100644 (file)
--- a/js/gdm/fingerprint.js
+++ b/js/gdm/fingerprint.js
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index bde2e4940ccba43494177d004765ef5a07b736f2..4a8a9e660f533aa9ea5c699b3bf0d88cb470f18c 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/js/gdm/powerMenu.js b/js/gdm/powerMenu.js
index 10e832eb5648ae468ab307cfededb28932a9008d..b590d75d93871f07660080fae47b5ff621bd85da 100644 (file)
--- a/js/gdm/powerMenu.js
+++ b/js/gdm/powerMenu.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index 85ab7b57a36d091e9b568b13966140416dd87d9c..a35fe28b2d58615a6a86746a8cddc8b0e30d8400 100644 (file)
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -1,4 +1,5 @@
-/* mode: js2; indent-tabs-mode: nil; tab-size: 4 */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
 /* The name of this package (not localized) */
 const PACKAGE_NAME = '@PACKAGE_NAME@';
 /* The version of this package */

diff --git a/js/misc/docInfo.js b/js/misc/docInfo.js
index 8ec375aa9442cd2d4e9d41b1b4b5c8a6d608910f..d4499a0a4db3befb8707c9a9562a29e8c64ff94a 100644 (file)
--- a/js/misc/docInfo.js
+++ b/js/misc/docInfo.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

diff --git a/js/misc/fileUtils.js b/js/misc/fileUtils.js
index ea80dc35b2a054c4f009b288c0afac5245d5ca2a..cd7339c2c796d539f9a507d9463bf82c06a06773 100644 (file)
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -1,3 +1,5 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 

diff --git a/js/misc/format.js b/js/misc/format.js
index dcebf7e68362b623a3db1caa1687b9ba3bb106f4..54320c0bc9eaaaf1634ac4b4cdb8fd64b20438b4 100644 (file)
--- a/js/misc/format.js
+++ b/js/misc/format.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 /*
  * This function is intended to extend the String object and provide

diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
index b3dc0689188f0c67e45c46790824d3efea621eae..a2b61fd49789d07d752b28781bf74b4e0d2a7a8a 100644 (file)
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;

diff --git a/js/misc/history.js b/js/misc/history.js
index fa655cfa0709c0065e8912455e33468fdce452f4..2c127c3a7933ea4f2a8673f47776c8d958c567fa 100644 (file)
--- a/js/misc/history.js
+++ b/js/misc/history.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;

diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
index f33023805fed555eaaed4fbb7496ec6d00607921..6fb2e2c76abc0a0c3d168e89b1ce212696b0cb8a 100644 (file)
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;

diff --git a/js/misc/params.js b/js/misc/params.js
index 88596ce7cb8caaa7e84a8b8194dfd9756ffcbd66..2b9dc0cac1d7452d7f17c0eff9e0b9a95b79c42e 100644 (file)
--- a/js/misc/params.js
+++ b/js/misc/params.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 // parse:
 // @params: caller-provided parameter object, or %null

diff --git a/js/misc/screenSaver.js b/js/misc/screenSaver.js
index f9d6af867c801e88a8e9726121311c7de2a69dac..c471856354c51939699627838f4fdc81946d7a99 100644 (file)
--- a/js/misc/screenSaver.js
+++ b/js/misc/screenSaver.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;

diff --git a/js/misc/util.js b/js/misc/util.js
index ee3c27f562019cd13346c4008d828ea72a87d65e..4d9a7c41d13307dc5da2e3b5760084eafe0ec36a 100644 (file)
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;

diff --git a/js/perf/core.js b/js/perf/core.js
index 4fb4fabc1e058da5895f1d4853495fb114664d3f..6b3b2747510d0cdaf1ea9f27b73a2df490b66cbb 100644 (file)
--- a/js/perf/core.js
+++ b/js/perf/core.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;

diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index b8c002bf1f78d409a901957ceeead97ed7bcfc96..09ffcbb50d943706511791507dde9011b1476ff4 100644 (file)
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index e348555fd71100ed1ab6040eb556872749a9b4aa..ec86c37db99a8350ab3988c38ab3533dd811c507 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;

diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js
index bbb89141517287d7be224c7673e351ed4d459373..5faca55956b13d5b4ce00e945ee18028cf063d70 100644 (file)
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Shell = imports.gi.Shell;
 const Lang = imports.lang;

diff --git a/js/ui/automountManager.js b/js/ui/automountManager.js
index edcdd8091740a10b7a707b8883ac2bbf17d0fb09..9a73da2942aca5d1de9f4efef4c51e90e7061d82 100644 (file)
--- a/js/ui/automountManager.js
+++ b/js/ui/automountManager.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const DBus = imports.dbus;

diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
index 5843db487a11cc9f0aed0bb8366d95c38e198b0f..71e51e6ce608279d3fd5dd0386e35fc507c24a97 100644 (file)
--- a/js/ui/autorunManager.js
+++ b/js/ui/autorunManager.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const DBus = imports.dbus;

diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 989a08954fdc7d3e5a0a7b6d124722e534dc3bde..4f6a2fb5a6610d525d9d64b5da9113ea51bd57d6 100644 (file)
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 612c90381e273309209e99757ff5c97f263a6f94..cec7b259658e2d782a349e97300d5c1c179e95c7 100644 (file)
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Clutter = imports.gi.Clutter;

diff --git a/js/ui/contactDisplay.js b/js/ui/contactDisplay.js
index 8cc46e03f9a49b3036c1976fc0823bde7bff043e..adeeb0c21654516d9b7f30889151658d8887c7f1 100644 (file)
--- a/js/ui/contactDisplay.js
+++ b/js/ui/contactDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Folks = imports.gi.Folks
 const Lang = imports.lang;

diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index 8662ff8cdcbcb929206d5b757e7fef18af7e1db3..64b029d0b66203bd32ca94b65e4031507d6148d6 100644 (file)
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 7f23cc68b0f3f634bdce5c1f51f469e648f5030c..91c63e913943ce8792747a82c81253c1e0b22e75 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Signals = imports.signals;

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 7196f0c8b3588ead317e3ea9ba1a5c2b1fff6361..224d2bcec6d59b9252ba7bb9d8349cb778f15a06 100644 (file)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;

diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index c8c8d075f1408855707e29555609db81732e732d..3c762f2845f979864427df4c94f70a1857f4a680 100644 (file)
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

diff --git a/js/ui/docDisplay.js b/js/ui/docDisplay.js
index 10646fb83e6d52db9df9fcf81d0e488b6df9bed2..9c8fe33eea1eda73f7517c8210c1e0377ecc2eaa 100644 (file)
--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DocInfo = imports.misc.docInfo;
 const Params = imports.misc.params;

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index c68a867505e97361ca0c43aaf67be6c2457c28dd..8ebe91355c92c7074240054ec0d59628bf40ccb4 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2010 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/js/ui/environment.js b/js/ui/environment.js
index d499219aa1ab77e5627afc26fa2ae77d975e5148..95bdc5f2d43b0ec59f9c72728e0e65d153bd8e14 100644 (file)
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 imports.gi.versions.Clutter = '1.0';
 imports.gi.versions.Gio = '2.0';

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 446fe722705ea5be33115e644375e5a48d7dc757..d1f53ef1957fa0827ecdaada464db50aa6406bad 100644 (file)
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;

diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index c2c362079ce71d76e942993f1dfac33e68092139..765bd2b1e43f9d8e4800ee4e8ed13d8822969d65 100644 (file)
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Shell = imports.gi.Shell;

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index b5e14f071c63847e39171134429d7835472f71a1..77ce2449599f8deec04de34615bf54d9422fcbd2 100644 (file)
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Caribou = imports.gi.Caribou;
 const Clutter = imports.gi.Clutter;

diff --git a/js/ui/layout.js b/js/ui/layout.js
index 0fe255ed4ca9274c6261cbe12ca538ad5be67f70..aad4bbbd6f5b9fd37d5191dd7ce9b53a4a289a3d 100644 (file)
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

diff --git a/js/ui/lightbox.js b/js/ui/lightbox.js
index 426308de2adcc776f794b57be6037ab872bed99b..58bce89d487e485edf6a1c396c1a0ca09acc82ce 100644 (file)
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;

diff --git a/js/ui/link.js b/js/ui/link.js
index d535311bb1d94aa27e9330edbf5275339f7a976d..4ad9baa8983373b7acb49cd60c0a1a30d6f0fca5 100644 (file)
--- a/js/ui/link.js
+++ b/js/ui/link.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index ca827d87049de58ea3bd393a5c5275073dc154e2..e3be685d9bb2028ca44b669360dd17029278dd77 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Cogl = imports.gi.Cogl;

diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index 33d05a8e513465c0d55f9272d7528ae029bcf0b4..e932e00f990d251fd24df7fb553c8d3674ec94f1 100644 (file)
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;

diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js
index 76cd6296d7198865700787df9c527200f92c865f..aefeb49bba7d10fee920b6c7aaac33e3e54f868d 100644 (file)
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Main = imports.ui.main;

diff --git a/js/ui/main.js b/js/ui/main.js
index 7e2588ffa71a4ffb4c07dab2156e4352a2ee4e01..4c97440dfed91ce015aa77954914fd2c55ef8635 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index fa7efc28db761c403a1bfa3d4bdfb66dfa4c5d26..a45fae44b7d6b53ce76a1159a7558bd5c18b278a 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 270423aaf60c5c8a07643e048957ff39206fd5e0..faea99599ce596fd3210a42fd6b846079ba7785a 100644 (file)
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;

diff --git a/js/ui/networkAgent.js b/js/ui/networkAgent.js
index fad9cd11e4495f69f89cb0ea31b71b8461903e81..f5c9524567230b7577e650bc6d260a9106559152 100644 (file)
--- a/js/ui/networkAgent.js
+++ b/js/ui/networkAgent.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Giovanni Campagna <scampa.giovanni@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index d3321d7100eea06e8be15e697103ea13162e036b..4ec556a85a0cc45ecd6b6477d9c9815c076b29e3 100644 (file)
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;

diff --git a/js/ui/overview.js b/js/ui/overview.js
index 1f6d366eb42b255861db45727a75bc301f272401..567775cfbbc819a0245e16f2679cbc57c07dc3b7 100644 (file)
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 2146874a6f6c3ce97c9fa8f242cd3dce8c272a1e..2f78db9666b24840a1cb25694f2f6045176bac9a 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;

diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js
index 9dbf594e59296c6712a1ea9e4642807e84f070a9..1f7b87ed0dc6e00c1afd5441efa72ae7acb15126 100644 (file)
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

diff --git a/js/ui/placeDisplay.js b/js/ui/placeDisplay.js
index 28f27f8dbd529c0bfcb13edc5bfc596f67531f9b..4864f2c7bf6b245483f05920bbeea203476e5338 100644 (file)
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;

diff --git a/js/ui/polkitAuthenticationAgent.js b/js/ui/polkitAuthenticationAgent.js
index f5b027b7060fe0c977baabc5b703858d52fa3021..92117fcb81634c8362f4dd9e2cd6b472719e50e7 100644 (file)
--- a/js/ui/polkitAuthenticationAgent.js
+++ b/js/ui/polkitAuthenticationAgent.js
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2010 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 3ee3c1770dfc64096b6ff005ea5c2de5ed6b1f52..d5048a272252cf7e5a04c66015e59960a68d3fe5 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;

diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index bd6fc25ae5d5b0d581e31c2d848c7eb255ab02e5..c20a3de8ce8e291458eaae46c554b59e873769e6 100644 (file)
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;

diff --git a/js/ui/scripting.js b/js/ui/scripting.js
index db7f58d48c88bcc21798a56b105400967f196ad5..3b8e4452117bdcd57f1b6ea6361552e8d70b3490 100644 (file)
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Gio = imports.gi.Gio;

diff --git a/js/ui/search.js b/js/ui/search.js
index 055bf0f243e4a3c5dd491879b228011ad1ed0bc5..20c5f81a488f1766e067a31bc6a0a604f96726bf 100644 (file)
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;

diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
index 42c1a26b28f30dfd35107c54f2686a84e333bce7..3151f097561a75f6cbba2b81d923adbbd065bafc 100644 (file)
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index ebf0c76aff9e9bba7aaa50d58568220fd4f0fd8b..1fcfb0cf0191d1c98829dcc8caca38cb6002218a 100644 (file)
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;

diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index 9ccaaea6ec4e38b4af5f058d838833c1454ef64f..b6281f31898eebb4d8975f0df61125d8aaadca01 100644 (file)
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;

diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 4ded5a32663150a7ab81c709f332f5d10f154997..dd5c85aa570d13f6757a63d15e38fba8bd6c9248 100644 (file)
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const GConf = imports.gi.GConf;

diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index 77be89daf5662a49833e3030f3b71595ac94401e..f2d95f504d8485c43fc3c8d2b794daf47f5e35e2 100644 (file)
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index e344425a9393c254c2a8bc86f2574678b65ea917..231f0c78ec7896002fbf30d84a33120eb98e822d 100644 (file)
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GdkPixbuf = imports.gi.GdkPixbuf;

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 9730afcede7570b858a8a060be7bc4fd9666b938..4f368e3caaf80129ab68939d7cd9308a1726927d 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 const ByteArray = imports.byteArray;
 const DBus = imports.dbus;
 const GLib = imports.gi.GLib;

diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index 72e47a1eebff61876218dcbb8d3cce0def209b0b..aee22e9aac7bf13a97a58ed124346b6d6f822fa5 100644 (file)
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
 const DBus = imports.dbus;

diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index 5dc2507dc4be9b56f3e358f5a5de3578ae296dd2..f2132d838392d3b7ef40f94878f7a475dcb1fabd 100644 (file)
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;

diff --git a/js/ui/statusIconDispatcher.js b/js/ui/statusIconDispatcher.js
index 8b69e7dc3565ab9bf0d4f2f61981694afc3b9a75..33bd47bb77896877dd7652eb999f33586da5bf4b 100644 (file)
--- a/js/ui/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;

diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 7578d5a98ef0185a839474b22f4d8a0956e95094..e9eb3ad965a2181f09490df7b366c41f429dc71b 100644 (file)
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Gio = imports.gi.Gio;

diff --git a/js/ui/tweener.js b/js/ui/tweener.js
index 8a633bd349ae72d01e5d3ca0e7ab5cde21156769..d68d666070301b535f91f27e7b8dab3ec23eed6c 100644 (file)
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index d6e30af78bd45784a7a6a2f0663cc4abb9692aa9..40ca2f39e56b19e32b9fa3de6b696a1f8664a390 100644 (file)
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const AccountsService = imports.gi.AccountsService;
 const DBus = imports.dbus;

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 939fd4c57cd6f4dfdc322fdc64ac17a1c05b9f11..4791d0bf12a676b1b19801d5d5cb68d404b65c59 100644 (file)
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

diff --git a/js/ui/windowAttentionHandler.js b/js/ui/windowAttentionHandler.js
index 0dc35db9f3ef4c18a0ce1f15d3c0271cd185e027..b8dd2e39b6a6154efd9f4c1062c1f19104899dcf 100644 (file)
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 13f6e0a8a8b8929bee7e32893d371f0634ccecc9..473e9babb5896045320fc82cac574a28033917f5 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 97e784b9df77f2427174c24c7238d1fffd5ba80e..cf22acdcbf1ce01c1ca0383ecebbfb56d89b23fc 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GConf = imports.gi.GConf;

diff --git a/js/ui/workspaceSwitcherPopup.js b/js/ui/workspaceSwitcherPopup.js
index 3bd35ca1b5cdf8b88853d2dd8965eac64dc42e3a..a4883d459174abb00803df937ca10ede1e132d6d 100644 (file)
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 7a239ef6c9e10d7219a6140f6652093efe3e8d0f..0369c382508afdbe51be044344e8eabfc3270c11 100644 (file)
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 8cc1ee67abd7c1fa3f9827d672048bdc71773e9b..d99488539af87583dcee53da3cd77dddb86726eb 100644 (file)
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

diff --git a/js/ui/xdndHandler.js b/js/ui/xdndHandler.js
index fe8633abd6a9ff0ea0340c81a494fe25a882b428..08f0b47f8bf7416b13c8486cde6ce3a5ed3187b2 100644 (file)
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

diff --git a/tests/interactive/border-radius.js b/tests/interactive/border-radius.js
index 714dc711fe3a95d62e1b66ab1453fac885acd4bd..d3ab718bffcd5e6aa06503236874e8e186ae4b9b 100644 (file)
--- a/tests/interactive/border-radius.js
+++ b/tests/interactive/border-radius.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/interactive/border-width.js b/tests/interactive/border-width.js
index 60f76061939322cc250be7c52b38f7e6c5e0b0ca..988166c099ea2bf09d3c11ac48c10bd73165eb38 100644 (file)
--- a/tests/interactive/border-width.js
+++ b/tests/interactive/border-width.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index 8419ffbe253e9d2bf6df131442f22130bc822580..d5253d641805924d8d20386fee3d16b319e5268e 100644 (file)
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/interactive/box-layout.js b/tests/interactive/box-layout.js
index 547b1284fd9b0329cd1a1f8bcdc3747169e3f2d5..8d3882682099fc972b014cd326ddd2e6572cd5a3 100644 (file)
--- a/tests/interactive/box-layout.js
+++ b/tests/interactive/box-layout.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/interactive/box-shadows.js b/tests/interactive/box-shadows.js
index 74759df00e6bfe7b82e4eaa88f0db5ef0d8f30b0..a1ae5681d827367687251078458eca37de61b09b 100644 (file)
--- a/tests/interactive/box-shadows.js
+++ b/tests/interactive/box-shadows.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/interactive/calendar.js b/tests/interactive/calendar.js
index f8f50b97d329da2a1c3d0b487c615a2854f1deaf..0f041995edeaa8c1909580c618f7c3c88a06d79a 100644 (file)
--- a/tests/interactive/calendar.js
+++ b/tests/interactive/calendar.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

diff --git a/tests/interactive/css-fonts.js b/tests/interactive/css-fonts.js
index 273177646a270620f4e7474fcbae1647968651fd..6dcec50dc19aca180bf8695f1066f7c8229f2fd2 100644 (file)
--- a/tests/interactive/css-fonts.js
+++ b/tests/interactive/css-fonts.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/interactive/entry.js b/tests/interactive/entry.js
index 470770bddb73bcc01e00f1d097c05b727ef938fc..ed4b5bd770a3a794caea3140616ae7b6b8e37c60 100644 (file)
--- a/tests/interactive/entry.js
+++ b/tests/interactive/entry.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

diff --git a/tests/interactive/icons.js b/tests/interactive/icons.js
index 5ccd9abfd5ee4458193a5a6538080642ac9a62cb..25d1dfc091f948d2d7cfd52b6af452bec70d92fb 100644 (file)
--- a/tests/interactive/icons.js
+++ b/tests/interactive/icons.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/interactive/inline-style.js b/tests/interactive/inline-style.js
index e06082cab2d88c338a1c67f1ed77a0dd0c5e1916..c9cf9c72c2b1007fe7e19e733642f813cc67a4f3 100644 (file)
--- a/tests/interactive/inline-style.js
+++ b/tests/interactive/inline-style.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/interactive/scroll-view-sizing.js b/tests/interactive/scroll-view-sizing.js
index e4dffa24b4fc82f8c652c512e78df678bf455942..1f795b70b4305ce0a379ca476f94bd16c9ac14ee 100644 (file)
--- a/tests/interactive/scroll-view-sizing.js
+++ b/tests/interactive/scroll-view-sizing.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

diff --git a/tests/interactive/scrolling.js b/tests/interactive/scrolling.js
index fe28b9e93ecd4982fe5ccdcfe906d6570f134fdf..e03a4edcf3bb8943acae5e4a8487f220d1031244 100644 (file)
--- a/tests/interactive/scrolling.js
+++ b/tests/interactive/scrolling.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

diff --git a/tests/interactive/table.js b/tests/interactive/table.js
index 308ae91e3ec5e0b1c9933483418ceef03fd25e53..31771db9ca5f493b95a3ea7babecab6e46a80a26 100644 (file)
--- a/tests/interactive/table.js
+++ b/tests/interactive/table.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/interactive/transitions.js b/tests/interactive/transitions.js
index 7c8e0d30b55016be7f4db61c862b813abeb50c11..0409245911cdd5a24fe34cffcace644ef0c9870a 100644 (file)
--- a/tests/interactive/transitions.js
+++ b/tests/interactive/transitions.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

diff --git a/tests/testcommon/ui.js b/tests/testcommon/ui.js
index 82d5861d562e179baf833f23f7bb28926b30c64d..56a8aeccde124b669dd469d5a2195313edeb2cf6 100644 (file)
--- a/tests/testcommon/ui.js
+++ b/tests/testcommon/ui.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;

diff --git a/tests/unit/format.js b/tests/unit/format.js
index 80ada20e8e1e8945aba531fea77cb2c20e477cc5..d1064d07b9689bb085ab8ef60105e157ae05d78c 100644 (file)
--- a/tests/unit/format.js
+++ b/tests/unit/format.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 /*
  * Test cases for the Format module

diff --git a/tests/unit/markup.js b/tests/unit/markup.js
index 5a19500314b4746d775cdf4ec5f290e22eedfcaa..586258225e44508a7e6c0fe0a55c5cac4f4cfc70 100644 (file)
--- a/tests/unit/markup.js
+++ b/tests/unit/markup.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 // Test cases for MessageTray markup parsing
 

diff --git a/tests/unit/url.js b/tests/unit/url.js
index 9dae5563625ba68f03898f7a00ea6024af582b97..251725ca621f46aceadcbcc13f9aa3030363f0f9 100644 (file)
--- a/tests/unit/url.js
+++ b/tests/unit/url.js
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 // Test cases for MessageTray URLification